projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d05d879) | patch
Always issue a full prompt in vc-merge-branch operation.
authorChong Yidong <cyd@stupidchicken.com>
Tue, 23 Nov 2010 15:13:43 +0000 (10:13 -0500)
committerChong Yidong <cyd@stupidchicken.com>
Tue, 23 Nov 2010 15:13:43 +0000 (10:13 -0500)
commitadebe5d4024aad96afff3f7966f675a1b2463cd4
tree8b309f8e12a902ffb751d44f61b3ee663220323dtree | snapshot
parentd05d8795f5ea9b1e3e0c3b8010b96a29e33e1686commit | diff
Always issue a full prompt in vc-merge-branch operation.

* vc/vc.el (vc-merge): Remove optional arg PROMPT.  Always prompt
for a merge location.

* vc/vc-bzr.el (vc-bzr-pull): Remove unused var.
(vc-bzr-merge-branch): Always prompt.
(vc-bzr-async-command): Use the full branch filename.
lisp/ChangeLog diff | blob | history
lisp/vc/vc-bzr.el diff | blob | history
lisp/vc/vc.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.